-
Notifications
You must be signed in to change notification settings - Fork 2.9k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Set up two more jobs to handle staging and production cases for automerge workflow #1802
Conversation
Don't merge, looks like my logic for branches-ignore is wrong. |
Ok ready for review |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just a few syntax changes
.github/workflows/preDeploy.yml
Outdated
if: | | ||
${{ needs.chooseDeployActions.outputs.isStagingDeployLocked == 'true' }} && | ||
${{ needs.chooseDeployActions.outputs.isVersionBumpPR == 'false' }} | ||
if: ${{ needs.chooseDeployActions.outputs.isStagingDeployLocked == 'true' }} && ${{ needs.chooseDeployActions.outputs.isVersionBumpPR == 'false' }} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we need this to be like this:
if: ${{ needs.chooseDeployActions.outputs.isStagingDeployLocked == 'true' }} && ${{ needs.chooseDeployActions.outputs.isVersionBumpPR == 'false' }} | |
if: ${{ needs.chooseDeployActions.outputs.isStagingDeployLocked == 'true' && needs.chooseDeployActions.outputs.isVersionBumpPR == 'false' }} |
.github/workflows/preDeploy.yml
Outdated
if: | | ||
${{ needs.chooseDeployActions.outputs.isVersionBumpPR == 'true' }} && | ||
${{ needs.chooseDeployActions.outputs.isStagingDeployLocked == 'false' }} | ||
if: ${{ needs.chooseDeployActions.outputs.isVersionBumpPR == 'true' }} && ${{ needs.chooseDeployActions.outputs.isStagingDeployLocked == 'false' }} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
if: ${{ needs.chooseDeployActions.outputs.isVersionBumpPR == 'true' }} && ${{ needs.chooseDeployActions.outputs.isStagingDeployLocked == 'false' }} | |
if: ${{ needs.chooseDeployActions.outputs.isVersionBumpPR == 'true' && needs.chooseDeployActions.outputs.isStagingDeployLocked == 'false' }} |
.github/workflows/preDeploy.yml
Outdated
@@ -153,6 +149,10 @@ jobs: | |||
- name: Checkout master branch | |||
run: git checkout master | |||
|
|||
- name: Set Staging Version | |||
run: | |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
NAB no need for the | here AFAIK
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Okay, LGTM
@roryabraham looks like this was merged without passing tests. Please add a note explaining why this was done or remove the |
Merging to un-break deploys |
Details
This PR does two things:
OSBotify
master
, only merge if only those specific files are changed, and none are added or deletedstaging
, only merge if the PR head branch ismaster
production
, only merge if the PR head branch isstaging
Fixed Issues
Fixes deploys from not running
Tests
Merge this PR and verify that a staging PR is created and merged automatically